* lisp/progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end

of narrowed buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74707dd5f5a4925949532933b41cc0847f90af5b..da1049cf2ddb4085c8bdad9bbe891a32c087cb20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
+       of narrowed buffer (bug#11966).
+
 2012-07-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 2c258fb446a35a9e756d329d056fe36887c91ae5..58cbf26496d92fa244eb6964bcdba8047721cc5d 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3498,7 +3498,8 @@ Works before syntax recognition is done."
     (if end
        ;; Do the same for end, going small steps
        (save-excursion
-         (while (and end (get-text-property end 'syntax-type))
+         (while (and end (< end (point-max))
+                     (get-text-property end 'syntax-type))
            (setq pos end
                  end (next-single-property-change end 'syntax-type nil (point-max)))
            (if end (progn (goto-char end)